bitkeeper revision 1.1159.1.87 (412495f853g9qdFCK3fe-wp3blfTlA)

Trap error in cpu value from config.

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 63dc7f49ab08b470e01d32bf927c3352d9b2360b..f8345f58b4b106a96a4ba851365810f90fcc9270 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -703,10 +703,14 @@ class XendDomainInfo:
             return
         memory = self.memory
         name = self.name
-        cpu = int(sxp.child_value(self.config, 'cpu', '-1'))
+        try:
+            cpu = int(sxp.child_value(self.config, 'cpu', '-1'))
+        except:
+            raise VmError('invalid cpu')
         cpu_weight = self.cpu_weight
         dom = self.dom or 0
-        dom = xc.domain_create(dom= dom, mem_kb= memory * 1024, name= name, cpu= cpu, cpu_weight= cpu_weight)
+        dom = xc.domain_create(dom= dom, mem_kb= memory * 1024,
+                               name= name, cpu= cpu, cpu_weight= cpu_weight)
         if dom <= 0:
             raise VmError('Creating domain failed: name=%s memory=%d'
                           % (name, memory))